]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Delete Tidy
authorColin Walters <walters@verbum.org>
Wed, 19 Aug 2009 23:35:02 +0000 (19:35 -0400)
committerColin Walters <walters@verbum.org>
Thu, 27 Aug 2009 06:00:23 +0000 (02:00 -0400)
It wasn't used any more.

js/ui/altTab.js
js/ui/appDisplay.js
js/ui/genericDisplay.js
src/Makefile-tidy.am [deleted file]
src/Makefile.am
src/tidy/tidy-enum-types.c.in [deleted file]
src/tidy/tidy-enum-types.h.in [deleted file]
src/tidy/tidy-grid.c [deleted file]
src/tidy/tidy-grid.h [deleted file]
src/tidy/tidy-marshal.list [deleted file]

index d2a2711ca3f6a5e9ab3efa706af715032589b7ea..745d0dca781052aed41bd7335b4fcb79b18ecbb3 100644 (file)
@@ -44,10 +44,8 @@ AltTabPopup.prototype = {
                                    spacing: POPUP_GRID_SPACING,
                                    orientation: Big.BoxOrientation.VERTICAL });
 
-        // Icon grid. It would be nice to use Tidy.Grid for the this,
-        // but Tidy.Grid is lame in various ways. (Eg, it seems to
-        // have a minimum size of 200x200.) So we create a vertical
-        // Big.Box containing multiple horizontal Big.Boxes.
+        // Icon grid.  TODO: Investigate Nbtk.Grid once that lands.  Currently
+        // just implemented using a chain of Big.Box.
         this._grid = new Big.Box({ spacing: POPUP_GRID_SPACING,
                                    orientation: Big.BoxOrientation.VERTICAL });
         let gcenterbox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
index 8af912b3e918c08b7b8f559425d63edc625eb1cb..b31360531ee01704fd00fcdcc9f4009268d1331d 100644 (file)
@@ -6,7 +6,6 @@ const Pango = imports.gi.Pango;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
-const Tidy = imports.gi.Tidy;
 const Shell = imports.gi.Shell;
 const Lang = imports.lang;
 const Signals = imports.signals;
index 60991185f81437b848b51ab6f20406bfa32e8c75..2679c5728cb8a01b782d7cc6b14226f3c357a445 100644 (file)
@@ -10,7 +10,6 @@ const Mainloop = imports.mainloop;
 const Pango = imports.gi.Pango;
 const Signals = imports.signals;
 const Shell = imports.gi.Shell;
-const Tidy = imports.gi.Tidy;
 
 const Button = imports.ui.button;
 const DND = imports.ui.dnd;
diff --git a/src/Makefile-tidy.am b/src/Makefile-tidy.am
deleted file mode 100644 (file)
index 006980b..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-tidy_cflags =                                  \
-       -I$(top_srcdir)/src                     \
-       -DPREFIX=\""$(prefix)"\"                \
-       -DLIBDIR=\""$(libdir)"\"                \
-       -DG_DISABLE_DEPRECATED                  \
-       -DG_LOG_DOMAIN=\"Tidy\"                 \
-       $(MUTTER_PLUGIN_CFLAGS)                 \
-       $(NULL)
-
-tidy_built_sources = \
-       tidy-enum-types.h       \
-       tidy-enum-types.c       \
-       tidy-marshal.h          \
-       tidy-marshal.c
-
-BUILT_SOURCES += $(tidy_built_sources)
-
-TIDY_STAMP_FILES = stamp-tidy-marshal.h stamp-tidy-enum-types.h
-
-# please, keep this sorted alphabetically
-tidy_source_h =                                        \
-       tidy/tidy-grid.h                        \
-       $(NULL)
-
-tidy_source_h_priv =                           \
-       $(NULL)
-
-# please, keep this sorted alphabetically
-tidy_source_c =                                        \
-       tidy/tidy-grid.c                        \
-       $(NULL)
-
-tidy-marshal.h: stamp-tidy-marshal.h
-       @true
-stamp-tidy-marshal.h: Makefile tidy/tidy-marshal.list
-       $(AM_V_GEN) $(GLIB_GENMARSHAL) \
-               --prefix=_tidy_marshal \
-               --header \
-       $(srcdir)/tidy/tidy-marshal.list > xgen-tmh && \
-       (cmp -s xgen-tmh tidy-marshal.h || cp -f xgen-tmh tidy-marshal.h) && \
-       rm -f xgen-tmh && \
-       echo timestamp > $(@F)
-
-tidy-marshal.c: Makefile tidy/tidy-marshal.list
-       $(AM_V_GEN) (echo "#include \"tidy-marshal.h\"" ; \
-        $(GLIB_GENMARSHAL) \
-               --prefix=_tidy_marshal \
-               --body \
-        $(srcdir)/tidy/tidy-marshal.list ) > xgen-tmc && \
-       cp -f xgen-tmc tidy-marshal.c && \
-       rm -f xgen-tmc
-
-tidy-enum-types.h: stamp-tidy-enum-types.h Makefile
-       @true
-stamp-tidy-enum-types.h: $(tidy_source_h) tidy/tidy-enum-types.h.in
-       $(AM_V_GEN) ( cd $(srcdir) && \
-         $(GLIB_MKENUMS) \
-           --template $(srcdir)/tidy/tidy-enum-types.h.in \
-         $(tidy_source_h) ) >> xgen-teth && \
-       (cmp -s xgen-teth tidy-enum-types.h || cp xgen-teth tidy-enum-types.h) && \
-       rm -f xgen-teth && \
-       echo timestamp > $(@F)
-
-tidy-enum-types.c: stamp-tidy-enum-types.h tidy/tidy-enum-types.c.in
-       $(AM_V_GEN) ( cd $(srcdir) && \
-         $(GLIB_MKENUMS) \
-           --template $(srcdir)/tidy/tidy-enum-types.c.in \
-         $(tidy_source_h) ) >> xgen-tetc && \
-       cp xgen-tetc tidy-enum-types.c && \
-       rm -f xgen-tetc
-
-noinst_LTLIBRARIES += libtidy-1.0.la
-
-libtidy_1_0_la_LIBADD = $(TIDY_LIBS)
-libtidy_1_0_la_SOURCES = \
-       $(tidy_source_c) \
-       $(tidy_source_h) \
-       $(tidy_source_h_priv) \
-       $(tidy_built_sources) \
-       $(NULL)
-libtidy_1_0_la_CPPFLAGS = $(tidy_cflags)
-libtidy_1_0_la_LDFLAGS = $(LDADD)
-
-CLEANFILES += $(TIDY_STAMP_FILES) $(BUILT_SOURCES)
-
-EXTRA_DIST +=                                  \
-       tidy/tidy-enum-types.h.in               \
-       tidy/tidy-enum-types.c.in               \
-       tidy/tidy-marshal.list
index c57594b79fa9a87ca7d407ccf1bd70cb7921c265..d5fa188634afa47cdd28377ea4aa001c2b6c2003 100644 (file)
@@ -19,7 +19,6 @@ gnome-shell: gnome-shell.in
 CLEANFILES += gnome-shell
 EXTRA_DIST += gnome-shell.in
 
-include Makefile-tidy.am
 include Makefile-big.am
 include Makefile-gdmuser.am
 include Makefile-tray.am
@@ -152,7 +151,7 @@ libgnome_shell_la_LIBADD =  \
 libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
 
 typelibdir = $(pkglibdir)
-typelib_DATA = Shell-0.1.typelib Tidy-1.0.typelib Big-1.0.typelib
+typelib_DATA = Shell-0.1.typelib Big-1.0.typelib
 
 Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefile
        $(AM_V_GEN) $(G_IR_SCANNER)                     \
@@ -180,25 +179,6 @@ Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir Big-1.0.gir
                Shell-0.1.gir -o $@
 CLEANFILES += Shell-0.1.typelib
 
-Tidy-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefile
-       $(AM_V_GEN) $(G_IR_SCANNER)                     \
-               --namespace=Tidy                        \
-               --nsversion=1.0                         \
-               --include=Clutter-1.0                   \
-               --program=mutter                        \
-               --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
-               $(addprefix $(srcdir)/,$(tidy_source_h)) \
-               $(addprefix $(srcdir)/,$(tidy_source_c)) \
-               $(srcdir)/tidy-enum-types.h             \
-               $(tidy_cflags)                          \
-               -o $@
-CLEANFILES += Tidy-1.0.gir
-
-Tidy-1.0.typelib: libtidy-1.0.la Tidy-1.0.gir
-       $(AM_V_GEN) LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \
-               $(G_IR_COMPILER) Tidy-1.0.gir -o $@
-CLEANFILES += Tidy-1.0.typelib
-
 Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile
        $(AM_V_GEN) $(G_IR_SCANNER)                     \
                --namespace=Big                         \
diff --git a/src/tidy/tidy-enum-types.c.in b/src/tidy/tidy-enum-types.c.in
deleted file mode 100644 (file)
index 5f78912..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*** BEGIN file-header ***/
-#include "tidy-enum-types.h"
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
-#include "@filename@"
-/*** END file-production ***/
-
-/*** BEGIN value-header ***/
-GType
-@enum_name@_get_type(void) {
-  static GType enum_type_id = 0;
-  if (G_UNLIKELY (!enum_type_id))
-    {
-      static const G@Type@Value values[] = {
-/*** END value-header ***/
-
-/*** BEGIN value-production ***/
-        { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
-/*** END value-production ***/
-
-/*** BEGIN value-tail ***/
-        { 0, NULL, NULL }
-      };
-      enum_type_id = g_@type@_register_static("@EnumName@", values);
-    }
-  return enum_type_id;
-}
-/*** END value-tail ***/
diff --git a/src/tidy/tidy-enum-types.h.in b/src/tidy/tidy-enum-types.h.in
deleted file mode 100644 (file)
index 517cccb..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*** BEGIN file-header ***/
-#ifndef __TIDY_ENUM_TYPES_H__
-#define __TIDY_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
-/*** END file-production ***/
-
-/*** BEGIN file-tail ***/
-G_END_DECLS
-
-#endif /* !__TIDY_ENUM_TYPES_H__ */
-/*** END file-tail ***/
-
-/*** BEGIN value-header ***/
-GType @enum_name@_get_type (void) G_GNUC_CONST;
-#define TIDY_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
-
-/*** END value-header ***/
diff --git a/src/tidy/tidy-grid.c b/src/tidy/tidy-grid.c
deleted file mode 100644 (file)
index 0d01336..0000000
+++ /dev/null
@@ -1,1044 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* tidy-grid.h: Reflowing grid layout container for clutter.
- *
- * Copyright (C) 2008 Intel Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Written by: Øyvind Kolås <pippin@linux.intel.com>
- */
-
-/* TODO:
- *
- * - Better names for properties.
- * - Caching layouted positions? (perhaps needed for huge collections)
- * - More comments / overall concept on how the layouting is done.
- * - Allow more layout directions than just row major / column major.
- */
-
-#include <string.h>
-
-#include "tidy-grid.h"
-
-typedef struct _TidyGridActorData TidyGridActorData;
-
-static void tidy_grid_dispose             (GObject *object);
-static void tidy_grid_finalize            (GObject *object);
-
-static void tidy_grid_finalize            (GObject *object);
-
-static void tidy_grid_set_property        (GObject      *object,
-                                           guint         prop_id,
-                                           const GValue *value,
-                                           GParamSpec   *pspec);
-static void tidy_grid_get_property        (GObject      *object,
-                                           guint         prop_id,
-                                           GValue       *value,
-                                           GParamSpec   *pspec);
-
-static void clutter_container_iface_init  (ClutterContainerIface *iface);
-
-static void tidy_grid_real_add            (ClutterContainer *container,
-                                           ClutterActor     *actor);
-static void tidy_grid_real_remove         (ClutterContainer *container,
-                                           ClutterActor     *actor);
-static void tidy_grid_real_foreach        (ClutterContainer *container,
-                                           ClutterCallback   callback,
-                                           gpointer          user_data);
-static void tidy_grid_real_raise          (ClutterContainer *container,
-                                           ClutterActor     *actor,
-                                           ClutterActor     *sibling);
-static void tidy_grid_real_lower          (ClutterContainer *container,
-                                           ClutterActor     *actor,
-                                           ClutterActor     *sibling);
-static void
-tidy_grid_real_sort_depth_order (ClutterContainer *container);
-
-static void
-tidy_grid_free_actor_data (gpointer data);
-
-static void tidy_grid_paint (ClutterActor *actor);
-
-static void tidy_grid_pick (ClutterActor *actor,
-                                       const ClutterColor *color);
-
-static void
-tidy_grid_get_preferred_width (ClutterActor *self,
-                              gfloat        for_height,
-                              gfloat       *min_width_p,
-                              gfloat       *natural_width_p);
-
-static void
-tidy_grid_get_preferred_height (ClutterActor *self,
-                               gfloat        for_width,
-                               gfloat       *min_height_p,
-                               gfloat       *natural_height_p);
-
-static void tidy_grid_allocate (ClutterActor          *self,
-                               const ClutterActorBox *box,
-                               ClutterAllocationFlags flags);
-
-G_DEFINE_TYPE_WITH_CODE (TidyGrid, tidy_grid,
-                         CLUTTER_TYPE_ACTOR,
-                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
-                                                clutter_container_iface_init));
-
-#define TIDY_GRID_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TIDY_TYPE_GRID, \
-                                TidyGridPrivate))
-
-struct _TidyGridPrivate
-{
-  gfloat      for_height,  for_width;
-  gfloat      alloc_width, alloc_height;
-
-  GHashTable *hash_table;
-  GList      *list;
-
-  gboolean    homogenous_rows;
-  gboolean    homogenous_columns;
-  gboolean    end_align;
-  gfloat      column_gap, row_gap;
-  gdouble     valign, halign;
-
-  gboolean    column_major;
-
-  gboolean    first_of_batch;
-  gfloat      a_current_sum, a_wrap;
-  gfloat      max_extent_a;
-  gfloat      max_extent_b;
-};
-
-enum
-{
-  PROP_0,
-  PROP_HOMOGENOUS_ROWS,
-  PROP_HOMOGENOUS_COLUMNS,
-  PROP_ROW_GAP,
-  PROP_COLUMN_GAP,
-  PROP_VALIGN,
-  PROP_HALIGN,
-  PROP_END_ALIGN,
-  PROP_COLUMN_MAJOR,
-};
-
-struct _TidyGridActorData
-{
-  gboolean    xpos_set,   ypos_set;
-  gfloat      xpos,       ypos;
-};
-
-static void
-tidy_grid_class_init (TidyGridClass *klass)
-{
-  GObjectClass *gobject_class = (GObjectClass *) klass;
-  ClutterActorClass *actor_class = (ClutterActorClass *) klass;
-
-  gobject_class->dispose = tidy_grid_dispose;
-  gobject_class->finalize = tidy_grid_finalize;
-
-  gobject_class->set_property = tidy_grid_set_property;
-  gobject_class->get_property = tidy_grid_get_property;
-
-  actor_class->paint                = tidy_grid_paint;
-  actor_class->pick                 = tidy_grid_pick;
-  actor_class->get_preferred_width  = tidy_grid_get_preferred_width;
-  actor_class->get_preferred_height = tidy_grid_get_preferred_height;
-  actor_class->allocate             = tidy_grid_allocate;
-
-  g_type_class_add_private (klass, sizeof (TidyGridPrivate));
-
-
-  g_object_class_install_property
-                   (gobject_class,
-                    PROP_ROW_GAP,
-                    g_param_spec_float ("row-gap",
-                                       "Row gap",
-                                       "gap between rows in the layout",
-                                       0.0, G_MAXFLOAT,
-                                       0.0,
-                                       G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property
-                   (gobject_class,
-                    PROP_COLUMN_GAP,
-                    g_param_spec_float ("column-gap",
-                                       "Column gap",
-                                       "gap between columns in the layout",
-                                       0.0, G_MAXFLOAT,
-                                       0.0,
-                                       G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-
-
-  g_object_class_install_property
-                   (gobject_class,
-                    PROP_HOMOGENOUS_ROWS,
-                    g_param_spec_boolean ("homogenous-rows",
-                                          "homogenous rows",
-                                          "Should all rows have the same height?",
-                                          FALSE,
-                                          G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property
-                   (gobject_class,
-                    PROP_HOMOGENOUS_COLUMNS,
-                    g_param_spec_boolean ("homogenous-columns",
-                                          "homogenous columns",
-                                          "Should all columns have the same height?",
-                                          FALSE,
-                                          G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property
-                   (gobject_class,
-                    PROP_COLUMN_MAJOR,
-                    g_param_spec_boolean ("column-major",
-                                          "column-major",
-                                          "Do a column filling first instead of row filling first",
-                                          FALSE,
-                                          G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property
-                   (gobject_class,
-                    PROP_END_ALIGN,
-                    g_param_spec_boolean ("end-align",
-                                          "end-align",
-                                          "Right/bottom aligned rows/columns",
-                                          FALSE,
-                                          G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property
-                   (gobject_class,
-                    PROP_VALIGN,
-                    g_param_spec_double ("valign",
-                                         "Vertical align",
-                                         "Vertical alignment of items within cells",
-                                          0.0, 1.0, 0.0,
-                                          G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property
-                   (gobject_class,
-                    PROP_HALIGN,
-                    g_param_spec_double ("halign",
-                                         "Horizontal align",
-                                         "Horizontal alignment of items within cells",
-                                          0.0, 1.0, 0.0,
-                                          G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
-
-}
-
-static void
-clutter_container_iface_init (ClutterContainerIface *iface)
-{
-  iface->add              = tidy_grid_real_add;
-  iface->remove           = tidy_grid_real_remove;
-  iface->foreach          = tidy_grid_real_foreach;
-  iface->raise            = tidy_grid_real_raise;
-  iface->lower            = tidy_grid_real_lower;
-  iface->sort_depth_order = tidy_grid_real_sort_depth_order;
-}
-
-static void
-tidy_grid_init (TidyGrid *self)
-{
-  TidyGridPrivate *priv;
-
-  self->priv = priv = TIDY_GRID_GET_PRIVATE (self);
-
-  /* do not unref in the hashtable, the reference is for now kept by the list
-   * (double bookkeeping sucks)
-   */
-  priv->hash_table
-    = g_hash_table_new_full (g_direct_hash,
-                             g_direct_equal,
-                             NULL,
-                             tidy_grid_free_actor_data);
-}
-
-static void
-tidy_grid_dispose (GObject *object)
-{
-  TidyGrid *self = (TidyGrid *) object;
-  TidyGridPrivate *priv;
- 
-  priv = self->priv;
-
-  /* Destroy all of the children. This will cause them to be removed
-     from the container and unparented */
-  clutter_container_foreach (CLUTTER_CONTAINER (object),
-                             (ClutterCallback) clutter_actor_destroy,
-                             NULL);
-
-  G_OBJECT_CLASS (tidy_grid_parent_class)->dispose (object);
-}
-
-static void
-tidy_grid_finalize (GObject *object)
-{
-  TidyGrid *self = (TidyGrid *) object;
-  TidyGridPrivate *priv = self->priv;
-  
-  g_hash_table_destroy (priv->hash_table);
-
-  G_OBJECT_CLASS (tidy_grid_parent_class)->finalize (object);
-}
-
-
-void
-tidy_grid_set_end_align (TidyGrid *self,
-                         gboolean  value)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  priv->end_align = value;
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
-}
-
-gboolean
-tidy_grid_get_end_align (TidyGrid *self)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  return priv->end_align;
-}
-
-void
-tidy_grid_set_homogenous_rows (TidyGrid *self,
-                               gboolean  value)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  priv->homogenous_rows = value;
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
-}
-
-gboolean
-tidy_grid_get_homogenous_rows (TidyGrid *self)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  return priv->homogenous_rows;
-}
-
-
-void
-tidy_grid_set_homogenous_columns (TidyGrid *self,
-                                  gboolean  value)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  priv->homogenous_columns = value;
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
-}
-
-
-gboolean
-tidy_grid_get_homogenous_columns (TidyGrid *self)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  return priv->homogenous_columns;
-}
-
-
-void
-tidy_grid_set_column_major (TidyGrid *self,
-                            gboolean  value)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  priv->column_major = value;
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
-}
-
-gboolean
-tidy_grid_get_column_major (TidyGrid *self)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  return priv->column_major;
-}
-
-void
-tidy_grid_set_column_gap (TidyGrid    *self,
-                          gfloat       value)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  priv->column_gap = value;
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
-}
-
-gfloat
-tidy_grid_get_column_gap (TidyGrid *self)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  return priv->column_gap;
-}
-
-
-
-void
-tidy_grid_set_row_gap (TidyGrid    *self,
-                       gfloat       value)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  priv->row_gap = value;
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
-}
-
-gfloat
-tidy_grid_get_row_gap (TidyGrid *self)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  return priv->row_gap;
-}
-
-
-void
-tidy_grid_set_valign (TidyGrid *self,
-                      gdouble   value)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  priv->valign = value;
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
-}
-
-gdouble
-tidy_grid_get_valign (TidyGrid *self)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  return priv->valign;
-}
-
-
-
-void
-tidy_grid_set_halign (TidyGrid *self,
-                      gdouble   value)
-                                 
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  priv->halign = value;
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
-}
-
-gdouble
-tidy_grid_get_halign (TidyGrid *self)
-{
-  TidyGridPrivate *priv = TIDY_GRID_GET_PRIVATE (self);
-  return priv->halign;
-}
-
-
-static void
-tidy_grid_set_property (GObject      *object,
-                        guint         prop_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-{
-  TidyGrid *grid = TIDY_GRID (object);
-
-  TidyGridPrivate *priv;
-
-  priv = TIDY_GRID_GET_PRIVATE (object);
-
-  switch (prop_id)
-    {
-    case PROP_END_ALIGN:
-      tidy_grid_set_end_align (grid, g_value_get_boolean (value));
-      break;
-    case PROP_HOMOGENOUS_ROWS:
-      tidy_grid_set_homogenous_rows (grid, g_value_get_boolean (value));
-      break;
-    case PROP_HOMOGENOUS_COLUMNS:
-      tidy_grid_set_homogenous_columns (grid, g_value_get_boolean (value));
-      break;
-    case PROP_COLUMN_MAJOR:
-      tidy_grid_set_column_major (grid, g_value_get_boolean (value));
-      break;
-    case PROP_COLUMN_GAP:
-      tidy_grid_set_column_gap (grid, g_value_get_float (value));
-      break;
-    case PROP_ROW_GAP:
-      tidy_grid_set_row_gap (grid, g_value_get_float (value));
-      break;
-    case PROP_VALIGN:
-      tidy_grid_set_valign (grid, g_value_get_double (value));
-      break;
-    case PROP_HALIGN:
-      tidy_grid_set_halign (grid, g_value_get_double (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-tidy_grid_get_property (GObject    *object,
-                        guint       prop_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  TidyGrid *grid = TIDY_GRID (object);
-
-  TidyGridPrivate *priv;
-
-  priv = TIDY_GRID_GET_PRIVATE (object);
-
-  switch (prop_id)
-    {
-    case PROP_HOMOGENOUS_ROWS:
-      g_value_set_boolean (value, tidy_grid_get_homogenous_rows (grid));
-      break;
-    case PROP_HOMOGENOUS_COLUMNS:
-      g_value_set_boolean (value, tidy_grid_get_homogenous_columns (grid));
-      break;
-    case PROP_END_ALIGN:
-      g_value_set_boolean (value, tidy_grid_get_end_align (grid));
-      break;
-    case PROP_COLUMN_MAJOR:
-      g_value_set_boolean (value, tidy_grid_get_column_major (grid));
-      break;
-    case PROP_COLUMN_GAP:
-      g_value_set_float (value, tidy_grid_get_column_gap (grid));
-      break;
-    case PROP_ROW_GAP:
-      g_value_set_float (value, tidy_grid_get_row_gap (grid));
-      break;
-    case PROP_VALIGN:
-      g_value_set_double (value, tidy_grid_get_valign (grid));
-      break;
-    case PROP_HALIGN:
-      g_value_set_double (value, tidy_grid_get_halign (grid));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-
-static void
-tidy_grid_free_actor_data (gpointer data)
-{
-  g_slice_free (TidyGridActorData, data);
-}
-
-ClutterActor *
-tidy_grid_new (void)
-{
-  ClutterActor *self = g_object_new (TIDY_TYPE_GRID, NULL);
-
-  return self;
-}
-
-static void
-tidy_grid_real_add (ClutterContainer *container,
-                    ClutterActor     *actor)
-{
-  TidyGridPrivate *priv;
-  TidyGridActorData *data;
-
-  g_return_if_fail (TIDY_IS_GRID (container));
-
-  priv = TIDY_GRID (container)->priv;
-
-  g_object_ref (actor);
-
-  clutter_actor_set_parent (actor, CLUTTER_ACTOR (container));
-
-  data = g_slice_alloc0 (sizeof (TidyGridActorData));
-
-  priv->list = g_list_append (priv->list, actor);
-  g_hash_table_insert (priv->hash_table, actor, data);
-
-  g_signal_emit_by_name (container, "actor-added", actor);
-
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (container));
-
-  g_object_unref (actor);
-}
-
-static void
-tidy_grid_real_remove (ClutterContainer *container,
-                       ClutterActor     *actor)
-{
-  TidyGrid *layout = TIDY_GRID (container);
-  TidyGridPrivate *priv = layout->priv;
-
-  g_object_ref (actor);
-  
-  if (g_hash_table_remove (priv->hash_table, actor))
-    {
-      clutter_actor_unparent (actor);
-
-      clutter_actor_queue_relayout (CLUTTER_ACTOR (layout));
-
-      g_signal_emit_by_name (container, "actor-removed", actor);
-
-      if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (layout)))
-        clutter_actor_queue_redraw (CLUTTER_ACTOR (layout));
-    }
-  priv->list = g_list_remove (priv->list, actor);
-
-  g_object_unref (actor);
-}
-
-static void
-tidy_grid_real_foreach (ClutterContainer *container,
-                                   ClutterCallback callback,
-                                   gpointer user_data)
-{
-  TidyGrid *layout = TIDY_GRID (container);
-  TidyGridPrivate *priv = layout->priv;
-
-  g_list_foreach (priv->list, (GFunc) callback, user_data);
-}
-
-static void
-tidy_grid_real_raise (ClutterContainer *container,
-                                 ClutterActor *actor,
-                                 ClutterActor *sibling)
-{
-  /* STUB */
-}
-
-static void
-tidy_grid_real_lower (ClutterContainer *container,
-                                 ClutterActor *actor,
-                                 ClutterActor *sibling)
-{
-  /* STUB */
-}
-
-static void
-tidy_grid_real_sort_depth_order (ClutterContainer *container)
-{
-  /* STUB */
-}
-
-static void
-tidy_grid_paint (ClutterActor *actor)
-{
-  TidyGrid *layout = (TidyGrid *) actor;
-  TidyGridPrivate *priv = layout->priv;
-  GList *child_item;
-
-  for (child_item = priv->list;
-       child_item != NULL;
-       child_item = child_item->next)
-    {
-      ClutterActor *child = child_item->data;
-
-      g_assert (child != NULL);
-
-      if (CLUTTER_ACTOR_IS_VISIBLE (child))
-        clutter_actor_paint (child);
-    }
-
-}
-
-static void
-tidy_grid_pick (ClutterActor *actor,
-                           const ClutterColor *color)
-{
-  /* Chain up so we get a bounding box pained (if we are reactive) */
-  CLUTTER_ACTOR_CLASS (tidy_grid_parent_class)->pick (actor, color);
-
-  /* Just forward to the paint call which in turn will trigger
-   * the child actors also getting 'picked'.
-   */
-  if (CLUTTER_ACTOR_IS_VISIBLE (actor))
-   tidy_grid_paint (actor);
-}
-
-static void
-tidy_grid_get_preferred_width (ClutterActor *self,
-                               gfloat        for_height,
-                               gfloat       *min_width_p,
-                               gfloat       *natural_width_p)
-{
-  TidyGrid *layout = (TidyGrid *) self;
-  TidyGridPrivate *priv = layout->priv;
-  GList *iter;
-  gfloat natural_width = 0;
-  gfloat min_width = 0;
-
-  for (iter = priv->list; iter; iter=iter->next)
-    {
-      ClutterActor *child = iter->data;
-      gfloat child_natural_w, child_natural_h;
-      gfloat child_min_w, child_min_h;
-
-      clutter_actor_get_preferred_size (child, &child_min_w, &child_min_h,
-                                        &child_natural_w, &child_natural_h);
-
-      if (child_min_w > min_width)
-        min_width = child_min_w;
-      natural_width += child_natural_w;
-
-      if (iter->next)
-       natural_width += priv->column_gap;
-    }
-
-  if (min_width_p)
-    *min_width_p = min_width;
-  if (natural_width_p)
-    *natural_width_p = natural_width;
-}
-
-static void
-tidy_grid_get_preferred_height (ClutterActor *self,
-                                gfloat      for_width,
-                                gfloat      *min_height_p,
-                                gfloat      *natural_height_p)
-{
-  TidyGrid *layout = (TidyGrid *) self;
-  TidyGridPrivate *priv = layout->priv;
-  gfloat current_natural_width;
-  gfloat row_height;
-  gfloat natural_height;
-  GList *iter;
-
-  current_natural_width = 0;
-  natural_height = 0;
-  row_height = 0;
-  for (iter = priv->list; iter; iter=iter->next)
-    {
-      ClutterActor *child = iter->data;
-      gfloat child_natural_w, child_natural_h;
-
-      clutter_actor_get_preferred_size (child, NULL, NULL,
-                                        &child_natural_w, &child_natural_h);
-
-      if (iter == priv->list)
-        {
-          current_natural_width = child_natural_w;
-        }
-      else if ((current_natural_width + child_natural_w) > for_width)
-        {
-          natural_height += row_height + priv->row_gap;
-          current_natural_width = child_natural_w;
-          row_height = child_natural_h;
-        }
-      else
-        {
-          current_natural_width += priv->column_gap + child_natural_w;
-        }
-
-      if (child_natural_h > row_height)
-        row_height = child_natural_h;
-    }
-
-  natural_height += row_height;
-
-  if (min_height_p)
-    *min_height_p = natural_height;
-  if (natural_height_p)
-    *natural_height_p = natural_height;
-}
-
-static gfloat
-compute_row_height (GList                    *siblings,
-                    gfloat                    best_yet,
-                    gfloat                    current_a,
-                    TidyGridPrivate *priv)
-{
-  GList *l;
-
-  gboolean homogenous_a;
-  gboolean homogenous_b;
-  gfloat gap;
-
-  if (priv->column_major)
-    {
-      homogenous_b = priv->homogenous_columns;
-      homogenous_a = priv->homogenous_rows;
-      gap          = priv->row_gap;
-    }
-  else
-    {
-      homogenous_a = priv->homogenous_columns;
-      homogenous_b = priv->homogenous_rows;
-      gap          = priv->column_gap;
-    }
-
-  for (l = siblings; l != NULL; l = l->next)
-    {
-      ClutterActor *child = l->data;
-      gfloat natural_width, natural_height;
-
-      /* each child will get as much space as they require */
-      clutter_actor_get_preferred_size (CLUTTER_ACTOR (child),
-                                        NULL, NULL,
-                                        &natural_width, &natural_height);
-
-      if (priv->column_major)
-        {
-          gfloat temp = natural_height;
-          natural_height = natural_width;
-          natural_width = temp;
-        }
-
-      /* if the primary axis is homogenous, each additional item is the same
-       * width */
-      if (homogenous_a)
-        natural_width = priv->max_extent_a; 
-
-      if (natural_height > best_yet)
-        best_yet = natural_height;
-
-      /* if the child is overflowing, we wrap to next line */
-      if (current_a + natural_width + gap > priv->a_wrap)
-        {
-          return best_yet;
-        }
-      current_a += natural_width + gap;
-    }
-  return best_yet;
-}
-
-static gfloat
-compute_row_start (GList           *siblings,
-                   gfloat           start_x,
-                   TidyGridPrivate *priv)
-{
-  gfloat current_a = start_x;
-  GList *l;
-
-  gboolean homogenous_a;
-  gboolean homogenous_b;
-  gfloat gap;
-
-  if (priv->column_major)
-    {
-      homogenous_b = priv->homogenous_columns;
-      homogenous_a = priv->homogenous_rows;
-      gap          = priv->row_gap;
-    }
-  else
-    {
-      homogenous_a = priv->homogenous_columns;
-      homogenous_b = priv->homogenous_rows;
-      gap          = priv->column_gap;
-    }
-
-  for (l = siblings; l != NULL; l = l->next)
-    {
-      ClutterActor *child = l->data;
-      gfloat natural_width, natural_height;
-
-      /* each child will get as much space as they require */
-      clutter_actor_get_preferred_size (CLUTTER_ACTOR (child),
-                                        NULL, NULL,
-                                        &natural_width, &natural_height);
-
-
-      if (priv->column_major)
-        natural_width = natural_height;
-
-      /* if the primary axis is homogenous, each additional item is the same width */
-      if (homogenous_a)
-        natural_width = priv->max_extent_a; 
-
-      /* if the child is overflowing, we wrap to next line */
-      if (current_a + natural_width + gap > priv->a_wrap)
-        {
-          if (current_a == start_x)
-            return start_x;
-          return (priv->a_wrap - current_a);
-        }
-      current_a += natural_width + gap;
-    }
-  return (priv->a_wrap - current_a);
-}
-
-static void
-tidy_grid_allocate (ClutterActor          *self,
-                   const ClutterActorBox *box,
-                   ClutterAllocationFlags flags)
-{
-  TidyGrid *layout = (TidyGrid *) self;
-  TidyGridPrivate *priv = layout->priv;
-
-  gfloat current_a;
-  gfloat current_b;
-  gfloat next_b;
-  gfloat agap;
-  gfloat bgap;
-
-  gboolean homogenous_a;
-  gboolean homogenous_b;
-  gdouble  aalign;
-  gdouble  balign;
- 
-  current_a = current_b = next_b = 0;
-
-  GList *iter;
-
-  /* chain up to set actor->allocation */
-  CLUTTER_ACTOR_CLASS (tidy_grid_parent_class)
-    ->allocate (self, box, flags);
-
-  priv->alloc_width = box->x2 - box->x1;
-  priv->alloc_height = box->y2 - box->y1;
-
-  /* Make sure we have calculated the preferred size */
-  /* what does this do? */
-  clutter_actor_get_preferred_size (self, NULL, NULL, NULL, NULL);
-
-
-  if (priv->column_major)
-    {
-      priv->a_wrap = priv->alloc_height;
-      homogenous_b = priv->homogenous_columns;
-      homogenous_a = priv->homogenous_rows;
-      aalign = priv->valign;
-      balign = priv->halign;
-      agap          = priv->row_gap;
-      bgap          = priv->column_gap;
-    }
-  else
-    {
-      priv->a_wrap = priv->alloc_width;
-      homogenous_a = priv->homogenous_columns;
-      homogenous_b = priv->homogenous_rows;
-      aalign = priv->halign;
-      balign = priv->valign;
-      agap          = priv->column_gap;
-      bgap          = priv->row_gap;
-    }
-
-  priv->max_extent_a = 0;
-  priv->max_extent_b = 0;
-
-  priv->first_of_batch = TRUE;
-  
-  if (homogenous_a ||
-      homogenous_b)
-    {
-      for (iter = priv->list; iter; iter = iter->next)
-        {
-          ClutterActor *child = iter->data;
-          gfloat natural_width;
-          gfloat natural_height;
-
-          /* each child will get as much space as they require */
-          clutter_actor_get_preferred_size (CLUTTER_ACTOR (child),
-                                            NULL, NULL,
-                                            &natural_width, &natural_height);
-          if (natural_width > priv->max_extent_a)
-            priv->max_extent_a = natural_width;
-          if (natural_height > priv->max_extent_b)
-            priv->max_extent_b = natural_width;
-        }
-    }
-
-  if (priv->column_major)
-    {
-      gfloat temp = priv->max_extent_a;
-      priv->max_extent_a = priv->max_extent_b;
-      priv->max_extent_b = temp;
-    }
-
-  for (iter = priv->list; iter; iter=iter->next)
-    {
-      ClutterActor *child = iter->data;
-      gfloat natural_a;
-      gfloat natural_b;
-
-      /* each child will get as much space as they require */
-      clutter_actor_get_preferred_size (CLUTTER_ACTOR (child),
-                                        NULL, NULL,
-                                        &natural_a, &natural_b);
-
-      if (priv->column_major) /* swap axes around if column is major */
-        {
-          gfloat temp = natural_a;
-          natural_a = natural_b;
-          natural_b = temp;
-        }
-
-      /* if the child is overflowing, we wrap to next line */
-      if (current_a + natural_a > priv->a_wrap ||
-          (homogenous_a && current_a + priv->max_extent_a > priv->a_wrap))
-        {
-          current_b = next_b + bgap;
-          current_a = 0;
-          next_b = current_b + bgap;
-          priv->first_of_batch = TRUE;
-        }
-
-      if (priv->end_align &&
-          priv->first_of_batch)
-        {
-          current_a = compute_row_start (iter, current_a, priv);
-          priv->first_of_batch = FALSE;
-        }
-
-      if (next_b-current_b < natural_b)
-          next_b = current_b + natural_b;
-
-        {
-          gfloat          row_height;
-          ClutterActorBox child_box;
-
-          if (homogenous_b)
-            {
-              row_height = priv->max_extent_b;
-            }
-          else
-            {
-              row_height = compute_row_height (iter, next_b-current_b,
-                                               current_a, priv);
-            }
-
-          if (homogenous_a)
-            {
-              child_box.x1 = current_a + (priv->max_extent_a-natural_a) * aalign;
-              child_box.x2 = child_box.x1 + natural_a;
-
-            }
-          else
-            {
-              child_box.x1 = current_a;
-              child_box.x2 = child_box.x1 + natural_a;
-            }
-
-          child_box.y1 = current_b + (row_height-natural_b) * balign;
-          child_box.y2 = child_box.y1 + natural_b;
-
-
-          if (priv->column_major)
-            {
-              gfloat temp = child_box.x1;
-              child_box.x1 = child_box.y1;
-              child_box.y1 = temp;
-
-              temp = child_box.x2;
-              child_box.x2 = child_box.y2;
-              child_box.y2 = temp;
-            }
-
-          /* update the allocation */
-          clutter_actor_allocate (CLUTTER_ACTOR (child),
-                                  &child_box,
-                                  flags);
-
-          if (homogenous_a)
-            {
-              current_a += priv->max_extent_a + agap;
-            }
-          else
-            {
-              current_a += natural_a + agap;
-            }
-        }
-    }
-}
diff --git a/src/tidy/tidy-grid.h b/src/tidy/tidy-grid.h
deleted file mode 100644 (file)
index 9444c3f..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Authored By Matthew Allum  <mallum@openedhand.com>
- *
- * Copyright (C) 2008 OpenedHand
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TIDY_GRID_H__
-#define __TIDY_GRID_H__
-
-#include <clutter/clutter.h>
-
-G_BEGIN_DECLS
-
-#define TIDY_TYPE_GRID               (tidy_grid_get_type())
-#define TIDY_GRID(obj)                                       \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                        \
-                               TIDY_TYPE_GRID,               \
-                               TidyGrid))
-#define TIDY_GRID_CLASS(klass)                               \
-  (G_TYPE_CHECK_CLASS_CAST ((klass),                         \
-                            TIDY_TYPE_GRID,                  \
-                            TidyGridClass))
-#define TIDY_IS_GRID(obj)                                    \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj),                        \
-                               TIDY_TYPE_GRID))
-#define TIDY_IS_GRID_CLASS(klass)                            \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass),                         \
-                            TIDY_TYPE_GRID))
-#define TIDY_GRID_GET_CLASS(obj)                             \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj),                         \
-                              TIDY_TYPE_GRID,                \
-                              TidyGridClass))
-
-typedef struct _TidyGrid        TidyGrid;
-typedef struct _TidyGridClass   TidyGridClass;
-typedef struct _TidyGridPrivate TidyGridPrivate;
-
-struct _TidyGridClass
-{
-  ClutterActorClass parent_class;
-};
-
-struct _TidyGrid
-{
-  ClutterActor parent;
-
-  TidyGridPrivate *priv;
-};
-
-GType tidy_grid_get_type (void) G_GNUC_CONST;
-
-ClutterActor *tidy_grid_new                    (void);
-void          tidy_grid_set_end_align          (TidyGrid    *self,
-                                                gboolean     value);
-gboolean      tidy_grid_get_end_align          (TidyGrid    *self);
-void          tidy_grid_set_homogenous_rows    (TidyGrid    *self,
-                                                gboolean     value);
-gboolean      tidy_grid_get_homogenous_rows    (TidyGrid    *self);
-void          tidy_grid_set_homogenous_columns (TidyGrid    *self,
-                                                gboolean     value);
-gboolean      tidy_grid_get_homogenous_columns (TidyGrid    *self);
-void          tidy_grid_set_column_major       (TidyGrid    *self,
-                                                gboolean     value);
-gboolean      tidy_grid_get_column_major       (TidyGrid    *self);
-void          tidy_grid_set_row_gap            (TidyGrid    *self,
-                                                gfloat       value);
-gfloat        tidy_grid_get_row_gap            (TidyGrid    *self);
-void          tidy_grid_set_column_gap         (TidyGrid    *self,
-                                                gfloat       value);
-gfloat        tidy_grid_get_column_gap         (TidyGrid    *self);
-void          tidy_grid_set_valign             (TidyGrid    *self,
-                                                gdouble      value);
-gdouble       tidy_grid_get_valign             (TidyGrid    *self);
-void          tidy_grid_set_halign             (TidyGrid    *self,
-                                                gdouble      value);
-gdouble       tidy_grid_get_halign             (TidyGrid    *self);
-
-G_END_DECLS
-
-#endif /* __TIDY_GRID_H__ */
diff --git a/src/tidy/tidy-marshal.list b/src/tidy/tidy-marshal.list
deleted file mode 100644 (file)
index 4d90509..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-VOID:OBJECT
-VOID:VOID
-VOID:PARAM
-VOID:POINTER
-VOID:UINT
-VOID:UINT,UINT
-VOID:OBJECT,OBJECT
-VOID:STRING,OBJECT